2022 11 add sia405 to kek export #84

sjib · 2022-11-26T19:53:02Z

No description provided.

if export_model_name = SIA405_ABWASSER_2015_LV95 then export as export_model_name (SIA405_ABWASSER_2015_LV95), else export as model_name (KEK_2019_LV95)

- Added ABWASSER_ILI_EXPORT_MODEL and Added ABWASSER_ILI_EXPORT_MODEL_NAME to config

Error: line 16: SIA405_ABWASSER_2015_LV95.SIA405_Abwasser.Spezialbauwerk: tid ch080qwzAW001080: unknown property <Art>

<SIA405_ABWASSER_2015_LV95.SIA405_Abwasser.Abwasserknoten TID="ch080qwzAK001099">

sjib · 2022-11-28T15:58:50Z

@olivierdalang:

Should the testdata be correct or is there a reason to have invalid testdata set case_c_import_all and case_a_import_from_wincan? qgepqwat2ili/data/test_data/
Shall I correct the testdata sets?

- renamed old version with errors to case_c_import_all_with_errors

- additional parameter export_model_name needed in function calls utils.ili2db.export_xtf_data ()

sjib · 2022-11-28T16:41:32Z

ERROR: test_case_b_export_complete_qgep_to_xtf (qgepqwat2ili.tests.test_qgep.TestQGEPUseCases)
B. export the whole QGEP model to interlis

Traceback (most recent call last):
File "/home/runner/work/qgepqwat2ili/qgepqwat2ili/qgepqwat2ili/tests/test_qgep.py", line 87, in test_case_b_export_complete_qgep_to_xtf
main(["qgep", "export", path, "--recreate_schema"])
File "/home/runner/work/qgepqwat2ili/qgepqwat2ili/qgepqwat2ili/init.py", line 138, in main
utils.ili2db.export_xtf_data(SCHEMA, ILI_MODEL_NAME, args.path, make_log_path(log_path, "iliexport"))
TypeError: export_xtf_data() missing 1 required positional argument: 'log_path'

as it seems to be expected to fail

sjib · 2022-12-23T20:20:23Z

@olivierdalang Is their a way to look at the created "export.xtf" of this testexport to find out how much data was exported?

https://stackoverflow.com/questions/23040166/python-3-3-deprecationwarning-when-using-nose-tools-assert-equals The warning is meant to tell you that instead of TestCase.assertEquals() you need to use TestCase.assertEqual() as the alias has been deprecated.

sjib · 2023-01-12T19:15:07Z

@olivierdalang I found the solution to the failing test with self.assertEqual:
The bid is different in the two files - so I needed to make two variants of find_all_xml.

Please review and if it would be better to make an entry in the config to not have model related information in the testdata code please make a suggestion how to adapt and how to import config in test_qgep.py
Thanks

olivierdalang

One main question : export_xtf_data's new export_model_name argument, that involves many changes in the PR, seems completely unused ?

Otherwise mostly code style thing (removing useless comments / debug statements).

qgepqwat2ili/utils/ili2db.py

qgepqwat2ili/tests/test_qgep.py

+        for line in Lines:
+            count += 1
+            logger.warning("Line{}: {}".format(count, line.strip()))
+
        root = ET.parse(path)


qgepqwat2ili/__init__.py

qgepqwat2ili/gui/__init__.py

qgepqwat2ili/tests/test_qgep.py

olivierdalang · 2023-03-09T15:14:12Z

@sjib Ok made my changes, from the tests it seems to work. Can you double check ?

sjib · 2023-03-09T15:45:01Z

I only get one file (VSA_KEK) and not two files (VSA_KEK and SIA405 Abwasser) as expected now
20230309_qgep-export_test_adaption_OD_add_sia405_abwasser_pullrequest.xtf.zip

olivierdalang · 2023-03-09T16:04:43Z

@sjib I just manually tested, and ran into an error in which you would have ran as well, so I'm not sure you tested the correct version ? Can you try again with the latest changes, which exports both files successfully here (just tested). Just make sure to pull the latest changes of the submodule, and are on master on the plugin, then also make sure to restart QGIS (under certain circumstances, the plugin reloader may not reload the qgepqwat2ili submodule propertly)

sjib · 2023-03-09T16:18:05Z

Now i get also 2 files as expected.
20230309_qgep-export_test_adaption_OD_add_sia405_abwasser_pullrequest2.xtf.zip

olivierdalang · 2023-03-09T16:20:09Z

Ok so it behaves as expected ? Ok for merge ?

sjib · 2023-03-09T16:21:09Z

@olivierdalang Yes, ok for merge! Thanks for all support.

sjib added 7 commits November 26, 2022 19:41

def export_xtf_data add option export_model_name

81caf28

if export_model_name = SIA405_ABWASSER_2015_LV95 then export as export_model_name (SIA405_ABWASSER_2015_LV95), else export as model_name (KEK_2019_LV95)

Added network export in addition to KEK export

723fcf0

Added MODEL names in xtf filenames and messages / config update

a72b205

- Added ABWASSER_ILI_EXPORT_MODEL and Added ABWASSER_ILI_EXPORT_MODEL_NAME to config

adjusting filenames and messages

4a19bff

testdata case_c_import_all.xtf korrigiert

c90e8ff

Error: line 16: SIA405_ABWASSER_2015_LV95.SIA405_Abwasser.Spezialbauwerk: tid ch080qwzAW001080: unknown property <Art>

testdata ch080qwzAK001099 commented out

c57b315

<SIA405_ABWASSER_2015_LV95.SIA405_Abwasser.Abwasserknoten TID="ch080qwzAK001099">

added ilival log

467d54a

sjib added 2 commits November 28, 2022 17:18

Correction test_data case_c_import_all

45c2fed

- renamed old version with errors to case_c_import_all_with_errors

added additional export also to qgepqwat2ili\_init_.py

2fe90ec

- additional parameter export_model_name needed in function calls utils.ili2db.export_xtf_data ()

sjib added 3 commits November 28, 2022 17:43

ident fixed

00599aa

ident fixing 2

ca8900d

Renamed case_c_import_all.xtf again to the data with errors

95a928a

as it seems to be expected to fail

sjib mentioned this pull request Nov 28, 2022

Documentation of tests missing #85

Closed

sjib added 3 commits December 23, 2022 15:40

Adjust back to latest testdata

26af6ad

Integrate Testdata 2

816f99c

integrating corrected tests test_qgep.py

119c920

sjib added 11 commits January 3, 2023 21:17

Add logger.info Perform various checks

f5eea65

try to display path

3b667ad

adapted root path as result file gets other name now

8dc9c02

adapted resultpath

b197883

logger.warning(resultpath)

2a9d3a7

add print result file

1e447e9

adjusted indent

728447a

delete character

9b916f6

intend corrected

6279172

intention corrected

78e905b

sjib added 4 commits January 12, 2023 17:02

corrections

4158409

add file.close() for file1 and file2

834aa85

find_all_xml - make two versions as bid is different

94b8364

missing root instead of root2

9ad3fb7

sjib requested a review from olivierdalang January 12, 2023 19:11

sjib changed the title ~~[WIP] 2022 11 add sia405 to kek export~~ 2022 11 add sia405 to kek export Jan 12, 2023

This was referenced Mar 20, 2023

INTERLIS Export SIA405 Abwasser teksi/wastewater_old#31

Closed

2022 11 add sia405 to kek export QGEP/qgepplugin#78

Merged

ponceta added this to the 2023.0 milestone Feb 22, 2023

ponceta mentioned this pull request Feb 22, 2023

[outdated] interlis_additional_models_initial_implementation #78

Closed

Merge branch 'master' into 2022-11-add-sia405-to-kek-export

dc737da

olivierdalang requested changes Mar 9, 2023

View reviewed changes

olivierdalang added 4 commits March 9, 2023 15:10

fix lost piece of code during merge

9830bd7

code style

abd939b

update readme

72f1b5e

(minor)

8eaf12e

olivierdalang requested review from olivierdalang and removed request for olivierdalang March 9, 2023 15:13

olivierdalang approved these changes Mar 9, 2023

View reviewed changes

fix export and more refactoring

85b58c1

olivierdalang merged commit 98c50b0 into master Mar 9, 2023

olivierdalang deleted the 2022-11-add-sia405-to-kek-export branch March 9, 2023 16:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2022 11 add sia405 to kek export #84

2022 11 add sia405 to kek export #84

sjib commented Nov 26, 2022

sjib commented Nov 28, 2022

sjib commented Nov 28, 2022 •

edited

Loading

sjib commented Dec 23, 2022

sjib commented Jan 12, 2023

olivierdalang left a comment

This comment was marked as resolved.

olivierdalang commented Mar 9, 2023

sjib commented Mar 9, 2023

olivierdalang commented Mar 9, 2023

sjib commented Mar 9, 2023

olivierdalang commented Mar 9, 2023

sjib commented Mar 9, 2023

2022 11 add sia405 to kek export #84

2022 11 add sia405 to kek export #84

Conversation

sjib commented Nov 26, 2022

sjib commented Nov 28, 2022

sjib commented Nov 28, 2022 • edited Loading

sjib commented Dec 23, 2022

sjib commented Jan 12, 2023

olivierdalang left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

olivierdalang commented Mar 9, 2023

sjib commented Mar 9, 2023

olivierdalang commented Mar 9, 2023

sjib commented Mar 9, 2023

olivierdalang commented Mar 9, 2023

sjib commented Mar 9, 2023

sjib commented Nov 28, 2022 •

edited

Loading